Move noflet to tests
Fixed defmacro to prefix before expanding