second save

'fixed' most commented out tests
whatever is left commented is due to instance variables
  that would have to be made into properties