Added some tests... still a wip