Up to date code for test cases
Merge branch 'master' of https://github.com/yotengo/MaverickApplicationsCorporation