Add improved main tests. #116