removing dead code
moving tests