2.87 bugs fixed and tests pushed