made some new tests, condensed old work