Added more tests to the suite (wip, 70%)