Added unit tests
Aded e2e tests (in progress)