Some more tests
- Added some more tests