improve style
remove tests that were failing because of requirement change