Added class checking and faster else as per pull note
Added test for blank, invalid and wrong type builders