Added and reorganized the tests