fixes and test with body