test refactoring
switch to lazy vals
bump version