Fixes
Started adding e2e test