Test corrections and new test method