Native Criteria core - unit tests && cleaning