Refactor: Simplify tests to not test so many layers in each test