Started to write a few tests