collection fix, friendly tests