Added more e2e tests and unit tests for US1