minor steps towards functional testing