Refactored a lot of tests which are now passing, must fix broken: true tests