First dates case managed, tests and comments added