Continued to improve test coverage and moved apModalService out to it's own repo.