Pack unittest at the end of the file.
Remove some properties.
I believe @property to be annoying in maintenance.