Group tests!
Removed oldtests folder
Removed dependancy on mock