added findOne() support & tests