all builds and tests now working