new test + utility methods + files renamed