Added the tests. forgot to commit those before