WIP. Time for some proper scenario based tests