Modified test and client instructions