Fixing build unit tests