MB-81 #Added tests, adjusted for consistency
MB-81 #Added bad user tests
MB-81 #Some commenting