Remove FastSet, fix tests