test classes cleanup (fixed warnings and typos)