Fixed redundant and deprecated tests