Adding more context and updating tests