Fixed tests... e2e is next!