Added topics support to waddell, increased test coverage