Make the damn tests work