Wrote tests more or less