Tests created; some fixes implemented.