Unit dir
Unit and Integration dirs
Integration dir
Clean up and rearrange tests; add test running helper