Removed some ignored tests
Fixed a possible bug