Modify tests accordingly