Started adding tests and stubbed a few more 'core' services