Added more tests and tweaked test packages.