Update instrumentation; create unit tests for service layer