Removing duplication. Making tests more change resistant.