cleaned up grande finale
Merge branch 'refactor-tests' into development
Verison 1.14