clean up and fix make test