GH #300 - Updating tests.