remove silly macro-pasting we don't need

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
Adding layer API and tests

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>