Returned form brwak, made minort change to test code