More test cases. Test coverage is now fair I believe.