Updated tests
Even more stuff has been done