Fix tests return value
more testcase goodies