fixes to build process and testings