Our first set of tests working
Minor Refactoring