Building more tests and doing some minor fixes where the tests were failing :)