More main test cases
Uhh, last commit didnt have all the files modified. See previous commit messege