refs #11: fixed some broken tests