[#master] Added a few new tests.