refacotor(test): Fixes tests