cosmetic changes and added more tests