made the tests more generic and not tied to the domain