Added test coverage
Merged master changes