Moved tests out of SimpleTest