Issue #45. Branch Iss#45. Final update. Ensure all imports are correct. Add test cases