Fix build tests