Cleaned up test names

Cleaned up test names and updated assembly info for build