Trimmed up Test domain

just cleaned up a little bit of ugly properties