revamp test - 22