Moved tests to new framework