clean up models and fill in missing unit tests
add feature list topic subscriptions