getting tests working and moving things around
description clean up