update gitflow, better unit tests