Added more tests and refactored Statements Tests