Updated tests. Now functional.