Added tests to restructured project