Filled unit tests with life
Filled tests with life
Merge branch 'unit-tests'