Double check and minor changes on tests