Remove unnecessary tests and simplify test suite