UPDATE: Added unit test