Testing service WIP
Update Test service for recent changes
(Oops, deleted the wrong version)