Add filtering to streams controller
Improved StreamsController tests