Revert test to simple version