Updated the tests to run again and implemented GR-12