Removed 2 hacks after failed tests