Fixed all init tests, still need to change some stubs