94 percent test coverage
Merge branch 'testing'
merge tests and lauras design