GH #297 - Updating tests.