Bug fix and unit tests