Added some tests. Will work on them again later