Clean Up & improved tests

Tidied process from previous changes.
Updated tests