Cleaned up issues with sinks and new binaryaccretion test