Fixed ignored tests and fixed small bug
Merge