Collection tests w/ bug fixes