#109 : refactor david's work to fit new structure
#109 : add others blocks test cases