Simple tests now passing.