Added a few more tests