verified testing works and added mock test
Merge branch 'master' of github.com:sahellebusch/Olympus