Refactored test structure and Cake, minor modifications to documentation.
Merge pull request #2 from thelinmichael/refactoring-reschmactoring

Refactored test structure and Cake, minor modifications to documentation...