Suggestions for tests rewrite