rewrite tests until the refactoring jives