Add additional tests, correct error that captured semi-colons.