Tests for suitcase and refactoring

To add flexibility for our objects...