add support for makara for testing