Test cleanup
Test Updates
Halfway merge resolve
Merge branch 'bunny' of github.com:buttercoin/buttercoin into bunny