Made test checking more interesting
More notes
Last tweak