Fixed tests to comply with requirements