Added a test and feedback on mateis review