Modifications to tests