Now most boring part: test and fix