renamed testcase for #16
added testcase for #16
removed unused stuff
testcase for #16
removed testcase for #16
testcase for #16, next attempt
replaced values of expected file for testcase for #16