issues addressed
added testing
fixes to tests