Added body tests, and module