First review

Remove test mode