Fixing build tests