Remove clutter, move file, and add test

Change-Id: Iaa80bda6364ca8460c7af05f8e6f707ee9338057