Added proper runner code to be able to pick the right tests