Adding in unit tests for e2e