Also split them into unit and functional tests.
The initial one is for the releases/0.1 branch - any others are to handle changes in the 0.2 branch.