Changed test method names a bit