Fixed merge bug, unit tests now 100% coverage