Remove tests - prepearing for rewrite