New and free work, add basic test