Added system shutdown
Added some options to some of the fields
Initial version of tests (to find what incorrect model I have)