Updated checks
Updated test