Add custom tests