Few more steps to first tests