Cleanup

removed stub file hooks, made some changes to test.