streamlined build and cleaned up tests