Added some <todo> annotations.
Changed the list of deleted test ouput files.
Removed invocation of Berkeley stub. Now testing the whole system.
Implemented options for enduser mode. Dummy for now.