Add ability to prune old screens

I see that you significantly changed structure of your tests since I started on this. Can you please let me know what I need to adjust to put my tests in right places? Thanks!