Corrected error in test
Completed version 2 - need to add loooooads of tests