Added tests which were failing initially. All tests pass now.