cleaned up some style issues, outlined new tests