Adding Church Model and Tests