tests renamed to follow naming conventions