Fix all one tests