Reintroduced commented out test checks