Restructure tests directory in preparation for cli integration tests

Partial-implements: blueprint cli-integration-tests
Change-Id: I927c250d787414fb855df3c9952dff743ba11e24