Cleanup unit test
Check return values