fixing case
fixing case #2
More tests