More tests, cleanup & refactoring of code. Removed some unused and not working code that is covered in other parts of the code now.