Fixed secrets working more sane way. Got unit tests running.