[cleanup] added missing assertions, cleaned up test and helper methods