Fixed some minor issues and tests
fixed some minor issues and tests
fixed some minor issues and tests