Added a seperate test class