Added cor258's tests