Testing bug fixes, no progress though