Updated test fixtures. Added tests.