(test): Fixes for unit tests