Updated test files. Tests are now working but need extended.