Improve gtype test coverage