robot fixes & add test methods