Lapiz clean up and form mocking