Added a number of incomplete tests