Working unit tests, event handler stuff might work also

Core code is updated.  Web Service remains.
Merge branch 'master' of https://github.com/PhilipJordan/SOLID