removed old test code, added new framework for it