removed old code
tests