Reverted tweaks to status variables. Added benchmarking tests.