updated test cases, not there yet..