Cosmetic changes
Added more tests