Added body tests and code