Tidied Makefile.am
Removed commented setion from Makefile.am
Mocked account preferences and tested cmd_rooms