tests added, comments updated