Fix issues with decimal portion and provide test coverage for same.