Some quick fixes
Fixed one test