Build fixed, tests doesn't pass