Merging my changes into the main repo

I am merging my changes (tests, bug fixes and refactoring) into the main repo so that I can shut down my local one and use the main.