new test-case to implement; minor code fixes