removed old test, added new tests