clearer pattern for writing tests
preparing cela for platform modules
merge
merging with david