Unfuck the build and remove Tatu's tests