Torbjorn

Hi, wrote tests