Improved: tests are less implementation aware
Fixed: results are saved to body
Added: more tests