Added more tests to RuntimeTest; refactored and reorganized Tests