Fixed the tests \o/