more testing, cleanup couch methods/first run conditions