Adding hiccup and tests