refactor tests. KISS.