Split up basic test case to ease extending
Fix for test
Merge pull request #16 from RentMethod/split_tests

Split up basic test case to ease extending