* fix unavailable slots + add relevant test * code clean up --------- Co-authored-by: CarinaWolli <[email protected]>