[#40] Many of the tests fixed