Smaller fixes
Updated build/test script