modify function return types for abstract build test
updating tests and moving files around