Cleaned up new tests
Moved some metadata stuff to Extensions