Fixed tests for testing issue #58