Moved tests to unit folder in order to start creating e2e tests