Fix #544 Issue with tests