Added context for unit tests