First tests now passing