Updates for interfaces, unit tests passing again