Added some e2e tests, fixed some unit tests