Bugfixes and comments for broken tests