tweaked unit tests, build script