Another life-saving bugfix, all tests now included