Fixed Constructor and tests