Revamped tests