cleanup of test and incomplete work (now in individual branches) as requested by Priya - she is sitting here approving the changes