extended and revised tests