changes made during the 2013-06-18 practice + BUG-FIXES for test mode