testing fixes, not well done #89