fixes, test added