Added more context to tests