Tests are now semi-functional