Hide testing code from public, fix instructions and options headers