added all the old tests