Testing methods modified