Removed redundant costant
Ordered test spec's hierarchy
Fixed moronic regression bug