fixing some broken tests, resolved #170