Revert "Removing old tests"

This reverts commit 09dd1fa42d466ba1dcf9edcdc62eab702df7f9b1.