Acronym test added, some cleanups