Continuing to debug

Modified unit tests
Found several bugs
Merge branch 'Voronoi' of https://github.com/dreac0nic/nimbus into Voronoi