* Some var renames and small changes
Refactoring tests