Started to write some tests