Fix failing unit test, rename tests for consistency