Fixed broken unit tests, continued development on Trust Service