Add tests for maker