tests and fixes
removed old spec