Moving on to testing
Added tests to header