added 2 more testcases and some new helpers