Cleaned unit test