updates to sinks code and unit tests