All tests restructured into Unit and Integration