Fixed all tests, only one broken test now