refactored assets and their usage in tests
tests for service passed