removed old code, now test works!!!!