Added new test, various imporvements