Testing

fixed the testing class + addded more tests