some promises and tests adjusts