Split each test and function up into a different module. Now runs tests multiple times (exact amount can be changed in the configuration variable)
Merging branches