update to e2e and unit tests