Update tests and add tests for Either