Added the tests

Now do the work.