Green specs by beth

All acceptance and unit tests passing