Make most tests work