Remove custom tests