room service unit tests revealed some implementation issues, fixed them.