Added some more test + fixes