Variable renaming. Refs #38
Added tests. Refs #38
Refactored findOrCreate functions, updated documentation. refs #38