Improved unit tests and adjust backend method signatures.