Added additional tests of functionality