Added new test. TODO