Remove redundant and old tests