Updated tests to allow them to build correctly
Removed errornous tests