Better test cases; testing also marshal return value