Reafctored test cases