Merge pull request #43 from zkessin/num_tests