Remove unnecessary returns, and cleanup test