added expectations, factories for listing
more cleanup