Added a few new tests