Integration with Praekelt USS + tests