some fixes for tests
More work to get tests to pass
re-enable services