Removed old test functions