Rename to US spelling to be consistent.
Moved out coverage from py.test for correct coverage