Simplify tests using strings instead objects