Rename tests for mock goal #66