Fixed names that aren't perl compatible
Developing better/easier test structure