CONSTRUCT and fix small register bug
This should cover Proxy tests