Adapted tests (testing less things) so it works now.