Added tests to branch - not refactored