Resolved last remaining unit test failure