Modifications on testing