Added more tests, handling assignment case