Added more tests + Resemble FML + Class responsibility changes