New tests implemented, old tests removed, and new ones coming to substitute