Few changes on test2