395/1620 passing unit tests