Making some tests work