Adding outline of remaining tests