poor test fixes and added temp error handling