Hopefully Fixed all tests