add markitup, fix tests