Bug fix and new test commit