removed old code, added test views