Suggested improvements / test case fixes