Minor changes testing