tests fixes and silly stuff