Created by: jvanbaarsen
Fixed some broken specs, that have not been caught, because of the specs not running for about a week.
