Stopped using obsolete macro

Replaced uses of `flet' with `cl-flet'.
Added tests

ERT tests in skinny-test.el