Reorder tests structure and Add the UI tests to the build