Add test suite
simplify test