Added test for service container, remove no longer functioning tests