Fixed tests with new build process