Reorganised "will foo {...}" tests, added tests for will (pre|post)