updating the testcases a bit
okay something preliminary up... not really working