Simplify test setup and add more tests