Add and reorder testing functionality to better suit JAR delivery
output.