Allow queries for rooms and users. Improved tests