FINALLY GOT THE TESTS WORKING