Removed superflous conditions thus restricting file to handle tests from 'single lab'
more changes