Created new testing scheme. Use "make test" to test all.