fix tests, move files up one level
build