filling out tests and removing tests for old code