Added some new test, will test later
Stuff