Restored tests to original versions