More Refactoring of tests
Remove key from production
Merging changes to current Intercode Git repository